Clarify comments on ConditionEnvironment placement

Clarify the comments on ConditionEnvironment= by mentioning that a
ConditionEnvironment= line must be located in the [Unit] section.

The comments suggesting using ConditionEnvironment= themselves are
in the [Service] section, which implicitly and wrongly suggests
that ConditionEnvironment= could be defined right there as well.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1472>

diff --git a/data/org.gnome.Shell@wayland.service.in b/data/org.gnome.Shell@wayland.service.in
index 12f7fbaa792f3b8bba78177fb1d80c89763b5970..38887eb193a1d7d62cce9c24ec7a2ef484ef4950 100644 (file)
--- a/data/org.gnome.Shell@wayland.service.in
+++ b/data/org.gnome.Shell@wayland.service.in
@@ -16,9 +16,9 @@ Before=gnome-session-initialized.target
 [Service]
 Slice=session.slice
 Type=notify
-# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I
-#       with systemd >= 246. Also, the current solution is kind of painful
-#       as systemd had a bug where it retries the condition.
+# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I in
+#       the [Unit] section with systemd >= 246. Also, the current solution is
+#       kind of painful as systemd had a bug where it retries the condition.
 # Only start if the template instance matches the session type.
 ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2'
 ExecStart=@bindir@/gnome-shell

diff --git a/data/org.gnome.Shell@x11.service.in b/data/org.gnome.Shell@x11.service.in
index f2ff0ce34aa8677313aedc6695b18701722e3003..7310f66081cfee41967baba43bb26ffe48d0742a 100644 (file)
--- a/data/org.gnome.Shell@x11.service.in
+++ b/data/org.gnome.Shell@x11.service.in
@@ -20,9 +20,9 @@ StartLimitBurst=3
 [Service]
 Slice=session.slice
 Type=notify
-# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I
-#       with systemd >= 246. Also, the current solution is kind of painful
-#       as systemd had a bug where it retries the condition.
+# NOTE: This can be replaced with ConditionEnvironment=XDG_SESSION_TYPE=%I in
+#       the [Unit] section with systemd >= 246. Also, the current solution is
+#       kind of painful as systemd had a bug where it retries the condition.
 # Only start if the template instance matches the session type.
 ExecCondition=/bin/sh -c 'test "$XDG_SESSION_TYPE" = "%I" || exit 2'
 ExecStart=@bindir@/gnome-shell